Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Apr 2012 22:57:44 +0000 (15:57 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 17 Apr 2012 22:57:44 +0000 (15:57 -0700)
commitd21b765b2a2badc0462418e0cffe864f6107ed63
treeabce663a7d014cf047c7ffc89dc386c617e0851f
parent0e301b04ff89b8e95cccb08194511c3fe087db98
parent23dfb0c4731480e6614a36d6c60c7c3b95704bec
Merge from trunk.
src/ChangeLog